From e606c98b8e87e4699f1fddb78468f9c3c14b1b47 Mon Sep 17 00:00:00 2001 From: Ralf Treinen Date: Wed, 11 Apr 2007 15:57:41 +0000 Subject: [PATCH] towards compiling ocaml 3.10.0 --- debian/changelog | 15 +++++++-- debian/ocaml-mode.dirs | 2 +- debian/patches/00list | 4 +++ debian/patches/install_scripts_config.dpatch | 32 ++++++++++++++++++++ debian/patches/ocaml-interp_manpage.dpatch | 19 ++++++++++++ debian/rules | 3 ++ 6 files changed, 72 insertions(+), 3 deletions(-) create mode 100755 debian/patches/install_scripts_config.dpatch create mode 100755 debian/patches/ocaml-interp_manpage.dpatch diff --git a/debian/changelog b/debian/changelog index da55dc0c..a54923f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,19 @@ ocaml (3.10.0~beta-1) UNRELEASED; urgency=low * Policy - mandate the compilation of *.cm[ao] with debugging information for libraries and forbid it for bytecode programs - - -- Stefano Zacchiroli Wed, 11 Apr 2007 11:13:11 +0200 + + [Ralf Treinen] + * debian/patches/* + - added: install_scripts_config: use a patched config.sh since PREFIX is + diferent at compile time and at installation time + - added: ocaml-interp_manpage, fixes typo in ocaml manpage + (closes: Bug#417847). + * debian/rules: + - added creation of config/config.debian.install + - Patch LIBDIR and STBLIBDIR setting in config/Makefile after invokation + of configure + + -- Ralf Treinen Wed, 11 Apr 2007 16:37:21 +0200 ocaml (3.09.3-1) experimental; urgency=low diff --git a/debian/ocaml-mode.dirs b/debian/ocaml-mode.dirs index b211c4f7..e12d94c6 100644 --- a/debian/ocaml-mode.dirs +++ b/debian/ocaml-mode.dirs @@ -1,2 +1,2 @@ usr/bin -usr/share/emacs/site-lisp/ocaml-mode \ No newline at end of file +usr/share/emacs/site-lisp/ocaml-mode diff --git a/debian/patches/00list b/debian/patches/00list index 6af82a6c..88c66d8d 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -8,3 +8,7 @@ call_ld_with_proper_flags #pr_o no_rpath stdlib_man_section +install_scripts_config +ocaml-interp_manpage + + diff --git a/debian/patches/install_scripts_config.dpatch b/debian/patches/install_scripts_config.dpatch new file mode 100755 index 00000000..9e6cd790 --- /dev/null +++ b/debian/patches/install_scripts_config.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## install_scripts_config.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use for installatation a patched config.sh (created by debian/rules) +## DP: Ralf Treinen + +@DPATCH@ +diff -urNad ocaml-3.10.0~beta~/build/install.sh ocaml-3.10.0~beta/build/install.sh +--- ocaml-3.10.0~beta~/build/install.sh 2007-03-06 10:48:38.000000000 +0100 ++++ ocaml-3.10.0~beta/build/install.sh 2007-04-11 15:21:12.000000000 +0200 +@@ -3,7 +3,7 @@ + + cd `dirname $0`/.. + +-. config/config.sh ++. config/config.debian.install.sh + + not_installed=$PWD/_build/not_installed + +diff -urNad ocaml-3.10.0~beta~/build/partial-install.sh ocaml-3.10.0~beta/build/partial-install.sh +--- ocaml-3.10.0~beta~/build/partial-install.sh 2007-03-06 10:48:38.000000000 +0100 ++++ ocaml-3.10.0~beta/build/partial-install.sh 2007-04-11 15:21:33.000000000 +0200 +@@ -8,7 +8,7 @@ + + cd `dirname $0`/.. + +-. config/config.sh ++. config/config.debian.install.sh + + not_installed=$PWD/_build/not_installed + diff --git a/debian/patches/ocaml-interp_manpage.dpatch b/debian/patches/ocaml-interp_manpage.dpatch new file mode 100755 index 00000000..411b8174 --- /dev/null +++ b/debian/patches/ocaml-interp_manpage.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ocaml-interp_manpage.dpatch by Ralf Treinen +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: typo in ocaml manpage. + +@DPATCH@ +diff -urNad ocaml-3.10.0~beta~/man/ocaml.m ocaml-3.10.0~beta/man/ocaml.m +--- ocaml-3.10.0~beta~/man/ocaml.m 2002-02-08 11:16:10.000000000 +0100 ++++ ocaml-3.10.0~beta/man/ocaml.m 2007-04-11 17:51:50.000000000 +0200 +@@ -25,7 +25,7 @@ + command is the toplevel system for Objective Caml, + that permits interactive use of the Objective Caml system through a + read-eval-print loop. In this mode, the system repeatedly reads Caml +-phrases from the input, then typechecks, compile and evaluate ++phrases from the input, then typechecks, compiles and evaluates + them, then prints the inferred type and result value, if any. The + system prints a # (sharp) prompt before reading each phrase. + diff --git a/debian/rules b/debian/rules index befa6aa0..30ad6aad 100755 --- a/debian/rules +++ b/debian/rules @@ -70,6 +70,8 @@ config-stamp: configure abi-sed -tkdefs "-I/usr/include/tcl8.4" \ -tklibs "-L/usr/lib -ltk8.4 -ltcl8.4" sed -e "s%MANDIR=.*$$%MANDIR=\$$(PREFIX)/share/man%g" \ + -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)%g" \ + -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/$(OCAMLABI)/sublibs%g" \ config/Makefile >config/Makefile.debian mv config/Makefile.debian config/Makefile if test -z "`grep "OTHERLIBRARIES.*labltk" config/Makefile`"; then\ @@ -173,6 +175,7 @@ install-arch: build-arch dh_installdirs -a # Let's install ocaml first. + sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(CURDIR)/debian/usr\"|' < config/config.sh > config/config.debian.install.sh $(MAKE) install PREFIX=$(CURDIR)/debian/ocaml-nox/usr install -m 644 debian/ocaml.xpm \ $(CURDIR)/debian/ocaml-interp/usr/share/pixmaps -- 2.30.2